Bug fixes, new services, edit service