formatting and small fixes