Minor bugs, less console.log output.