Move around vars, small tweaks.