Redid health & updated todo