fixed multiple bugs for one-room setups