fix some glitches .. all modes working again