added scene manager, various updates