enhanced/cleaned data structures and command-names.