Let shell handle environment variable expansion
Change terminal declaration syntax
Add error message for no matching entry