Patched up comment support and added some more support, added exceptions for broken syntax.