update restructured and improved auto-completion