formatting and language fixes