controller hotloading and bugfixes