bugfixes & new reloading