Fixed plenty of insanity in the old Console code