Removed unused import
Improved command auto-completion, fixed typos