Small bugfixes, changed some deprecated code and loads of text changes