Update for 5.2, Bugfixes and some stuff