Tweaks and minor bug fixes.