Shake == shuffle

Oh, and some stuff that was added before but not commited.