language bugs
layout bugs
update parser
language fix
Merge pull request #156 from ampatalas/bugFixes

MYGUIDE-587 MYGUIDE-589 MYGUIDE-632