fixes from Keith's initial design review