Comments now work!
Fixed bug in parser for entities