Fixes, tweaks, and minor improvements.