- remove ';'
- some fixes;