Comments implemented

I think i squashed all the bugs!