- added english comments
- Fixed a couple TODO´s