Updating bot to handle messages better, some cleanup on code.