Updated health check and a few more items