Switch to neocomplete; Some cleanup;
Some fixes for neocomplete;