Numerous and minor tweaks