moar fixaz

Including fixing quite a few MEGAderps by a certain dev other than me or
crazy. Now I'm not saying any names (*cough* logomaster256 *cough*), but
it's all in MoveWaterCircle, the former MoveSerpent, so you can compare
it.