A lot of bugs fixed, implemented a lot of different stuff