some clean up, $apply changes to currentState
update service name in tests
extend demo, update dist/