Mostly works now except for comments
Merge pull request #66 from hamberguesa/fix_moar_bugs

Mostly works now except for comments