shake modifications
more shake fixes