more minor modifications