More work on completion. help includes aliases in completion
Other small changes and cleanups.