adjust services in context
code simplifications
Version bump to 0.3.3