bug fixes and formatting updates