Much more comprehensive Scene building and some general cleanup