added return service and other bug fixes