diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 7f93f300c90..6bda16ed7ac 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -1,3 +1,5 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
+
 /proc/hex2num(hex)
 
 	if (!( istext(hex) ))
@@ -832,7 +834,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 	var/list/names = list()
 	var/list/creatures = list()
 	var/list/namecounts = list()
-
 	for(var/mob/M in mobs)
 		var/name = M.name
 		if (name in names)
@@ -841,7 +842,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 		else
 			names.Add(name)
 			namecounts[name] = 1
-
 		if (M.real_name && M.real_name != M.name)
 			name += " \[[M.original_name? M.original_name : M.real_name]\]"
 
@@ -850,7 +850,6 @@ Turf and target are seperate in case you want to teleport some distance from a t
 				name += " \[ghost\]"
 			else
 				name += " \[dead\]"
-
 		creatures[name] = M
 
 	return creatures
@@ -1346,8 +1345,8 @@ proc/listclearnulls(list/list)
 	return 1
 */
 
-/proc/do_after(var/mob/user as mob, delay as num, var/numticks = 5) 		// Replacing the upper one with this one because Byond keeps feeling that the upper one is an infinate loop
-	if(!user || isnull(user))												// This one should have less temptation
+/proc/do_after(var/mob/user as mob, delay as num, var/numticks = 5, var/needhand = 1) 		// Replacing the upper one with this one because Byond keeps feeling that the upper one is an infinate loop
+	if(!user || isnull(user))																// This one should have less temptation
 		return 0
 	if(numticks == 0)
 		return 0
@@ -1358,7 +1357,10 @@ proc/listclearnulls(list/list)
 
 	for(var/i = 0, i<numticks, i++)
 		sleep(delayfraction)
-		if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T) || !(user.equipped() == holding))
+
+		if(needhand && !(user.equipped() == holding))	//Sometimes you don't want the user to have to keep their active hand
+			return 0
+		if(!user || user.stat || user.weakened || user.stunned || !(user.loc == T))
 			return 0
 
 	return 1
@@ -1781,19 +1783,17 @@ proc/get_opposite(var/checkdir)
 			return NORTHEAST
 
 /proc/stringsplit(txt, character)
-	var
-		cur_text = txt
-		last_found = 1
-		found_char = findtext(cur_text,character)
-		list/list = list()
+	var/cur_text = txt
+	var/last_found = 1
+	var/found_char = findtext(cur_text,character)
+	var/list/list = list()
 	if(found_char)
 		var/fs = copytext(cur_text,last_found,found_char)
 		list += fs
 		last_found = found_char+length(character)
 		found_char = findtext(cur_text,character,last_found)
 	while(found_char)
-		var
-			found_string = copytext(cur_text,last_found,found_char)
+		var/found_string = copytext(cur_text,last_found,found_char)
 		last_found = found_char+length(character)
 		list += found_string
 		found_char = findtext(cur_text,character,last_found)
diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index ad51227c5ab..dee387c3a85 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -63,7 +63,7 @@
 /obj/structure/bookcase
 	name = "bookcase"
 	icon = 'library.dmi'
-	icon_state = "bookcase"
+	icon_state = "book-0"
 	anchored = 1
 	density = 1
 	opacity = 1
@@ -120,57 +120,58 @@
 					if(comp)
 						comp.inventory += B
 
-	attackby(obj/O as obj, mob/user as mob)
-		if(istype(O, /obj/item/weapon/book))
-			user.drop_item()
-			O.loc = src
-		else if(istype(O, /obj/item/weapon/pen))
-			var/newname = copytext(sanitize(input("What would you like to title this bookshelf?") as text|null),1,MAX_MESSAGE_LEN)
-			if(!newname)
-				return
-			else
-				setname(sanitize(newname))
+/obj/structure/bookcase/attackby(obj/O as obj, mob/user as mob)
+	if(istype(O, /obj/item/weapon/book))
+		user.drop_item()
+		O.loc = src
+		update_icon()
+	else if(istype(O, /obj/item/weapon/pen))
+		var/newname = copytext(sanitize(input("What would you like to title this bookshelf?") as text|null),1,MAX_MESSAGE_LEN)
+		if(!newname)
+			return
 		else
-			..()
-	attack_hand(var/mob/user as mob)
-		var/list/books = list()
-		for(var/obj/item/weapon/book/b in src.contents)
-			books.Add(b)
-		if(books.len)
-			var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") as null|anything in books
-			if(choice)
-				choice.loc = src.loc
+			name = ("bookcase ([sanitize(newname)])")
+	else
+		..()
+
+/obj/structure/bookcase/attack_hand(var/mob/user as mob)
+	if(contents.len)
+		var/obj/item/weapon/book/choice = input("Which book would you like to remove from the shelf?") in contents as obj|null
+		if(choice)
+			if(ishuman(user))
+				if(!user.get_active_hand())
+					user.put_in_hand(choice)
 			else
-				return
+				choice.loc = get_turf(src)
+			update_icon()
+
+/obj/structure/bookcase/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			for(var/obj/item/weapon/book/b in contents)
+				del(b)
+			del(src)
+			return
+		if(2.0)
+			for(var/obj/item/weapon/book/b in contents)
+				if (prob(50)) b.loc = (get_turf(src))
+				else del(b)
+			del(src)
+			return
+		if(3.0)
+			if (prob(50))
+				for(var/obj/item/weapon/book/b in contents)
+					b.loc = (get_turf(src))
+				del(src)
+			return
 		else
-			user << "None of these books pique your interest in the slightest."
+	return
 
-	proc
-		setname(var/t as text)
-			if(t)
-				src.name = "bookcase ([t])"
-
-	ex_act(severity)
-		switch(severity)
-			if(1.0)
-				for(var/obj/item/weapon/book/b in src.contents)
-					del(b)
-				del(src)
-				return
-			if(2.0)
-				for(var/obj/item/weapon/book/b in src.contents)
-					if (prob(50)) b.loc = (get_turf(src))
-					else del(b)
-				del(src)
-				return
-			if(3.0)
-				if (prob(50))
-					for(var/obj/item/weapon/book/b in src.contents)
-						b.loc = (get_turf(src))
-					del(src)
-				return
-			else
-		return
+/obj/structure/bookcase/update_icon()
+	if(contents.len < 5)
+		icon_state = "book-[contents.len]"
+	else
+		icon_state = "book-5"
 
 
 /obj/structure/bookcase/manuals/medical
@@ -179,6 +180,7 @@
 	New()
 		..()
 		new /obj/item/weapon/book/manual/medical_cloning(src)
+		update_icon()
 
 
 /obj/structure/bookcase/manuals/engineering
@@ -192,6 +194,7 @@
 		new /obj/item/weapon/book/manual/engineering_guide(src)
 		new /obj/item/weapon/book/manual/engineering_singularity_safety(src)
 		new /obj/item/weapon/book/manual/robotics_cyborgs(src)
+		update_icon()
 
 /obj/structure/bookcase/manuals/research_and_development
 	name = "R&D Manuals bookcase"
@@ -199,6 +202,7 @@
 	New()
 		..()
 		new /obj/item/weapon/book/manual/research_and_development(src)
+		update_icon()
 
 
 
@@ -606,9 +610,8 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
 				dat += "<A href='?src=\ref[src];switchscreen=7'>7. Access the Forbidden Lore Vault</A><BR>"
 			if(src.arcanecheckout)
 				new /obj/item/weapon/tome(src.loc)
-				user << "<font color=red>Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.</font>"
-				for (var/mob/V in hearers(src))
-					V.show_message("[usr] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2)
+				user << "<span class='warning'>Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.</span>"
+				user.visible_message("[user] stares at the blank screen for a few moments, his expression frozen in fear. When he finally awakens from it, he looks a lot older.", 2)
 				src.arcanecheckout = 0
 		if(1)
 			// Inventory