Migrated to new loose parser
Bug fixes
removed infinite loop block
Minor bug fixes
Bug fixes related to new parser
Removed infinite check