tweaks, updates, and formatting