Misc formatting and updates