[FIX] added comment and empty line tracking
[FIX] some minor parse errors