Cleanup and debug printout fixes.