fixing bugs + health