synchronous require only
drawers vc
minor fixes and refactoring