Bugfixes with mutliple doors and switches