Fix regressions;
Add 'quit' as an alias to 'exit';