small fixes and formatting work