Fixed arm glitches… I think