Cleaned up some code and expanded the console features