Some more comments, moved some bits around

Also removed unnecessary console output