Fixes and partial implementation of Scene support.