Client now prefers server corrections over his predictions

Also cured const-plague.