scene data locking, minor refinements