code clean ups and fixed z order issue with health bar