adds proto-statement
- more refactoring
- remove dead code
- new compiler version