Some minor optimizations
Also fixed the new health formula