a couple of minor fixes: changed tab order, etc.