add supertab, some tweaks
merge