Add some comments to prevent future bugs
Reuse the auto complete facility for the command prompt