- merged + some comments
- some more comments
- removed some unneeded functions