small updates, fixes, and formatting