formatting and bug fixes
formatting and bug fixes