Updating to add more console output and fixing some bugs