Major fixes to correctness.
Remove debug crud.
Last debug line.