* Improved a lot of stuff