Comments!

and a lot of bug fixes