Minor adjustments and tweaks (aka I forgot the difference).