Some modifications in parser
Some modifications in notifying
Bugfixes
A small optimization