several changes that hadn't been checked in...  tsk tsk
possible fix for Vim slowness