fix all the mariachi, make it mor logical (thanks daniwa) fix jitters