auto complete n demand
revert ac, org tweaks