merge + fixes
fixed nick.scene