fixes, merges, and tweaks.