updates and formatting