Quick-fix

- Fixed some bugs
- Added extra documentation