Fightbars + code fixes