bringing up to 12.0

deleted some whitespace and uncommonized loki