Cleanup/fix viewport, etc. Add world, entity, bounds.