added password service + small cleanups