arg, more minor fixes