Bugfixes & some small updates