a few minor modifications