Auto-complete mode

and a few updates.