updates and whitespace fixes