Add service restart and did few bug fixes.