improve s:complete
fix s:complete
move command! to top