change to neocomplete and fix bugs