major update and formatting tweaks