minor changes following testing