fixes and updates
format changes