Lots of Updates and formatting updates