Change to godlog, improvements