tabcomplete and controller tweaks