Bugfixes & when space selector