Cleanup & console enhancements
* Updated TODO