Fixed some variants; minor tweaks