Misc cleanup, logs and comments