bug fixes and formatting improvements