fixed errors from merge, also added static health bars above