Bug fixes and enhanced console