updates, added ops-spring, refactoring