some more minor modifications