accident bug fix, preperation for new room types