WIP changes

- some minor comments are edited
- the library still has some mind-blowing errors that must be fixed