Fix according to comments 4/3/14

Fix most comments, still one to go