Consolidated scenes

introduced a few bugs