Improving the log, fixed a couple bugs, cleanup