Final fixes, it seems to work.

Also comment out logging.