Small Fixes

- Some small fixes
- Todo list