refactored service editing, minor other