minor tweaks
bugfix -- passthrough existing $TERM when no match is found
cleanup