Hp Bar + minor changes