Clean-up and minor bug fixing after major refactor of console.