Reworking metrics
Added new metrics and checks
Locking down services and reworked starting of services