Some minor bugfixes & Renaming