Feature/issue 171 points 0

- Refactored point display
- Added tests
- Fixed some code issues