Removed comments and fixed some issues.
Edited the parser to work with more instances