fix and whitespace errors