Added health and did some const correctness