some updates and formatting