Shit load of improvements and fixes!