removed conque-shell; brought back trailing-whitespace