added Health Check,
more clean up, 
updated annotations