cleanup services and add a buncha comments