bug fixes and work on service