formatting and fixes