allows service rename on edit screen, fix other minor issues