- added todos
- minor refactoring