* Fixed more bugs
* Refactored a bit