Mostly scene update

Tired of redoing my changes between synchs