Numerous bug fixes, and minor tweaks.