service implementation
minor fixes