Fixes #64 and #62

For #62, I fixed most errors in the log that was relevant.