Fixed the printing of a few strings, moved some code around.