Console: various fixes & refactoring