Had to fix lots of small mistakes after cleanup.