Cleaned up.
Worked on ServiceManager, API seems to stabilize now ..