Start & Stop services + cleanup and couple of comments