few minor modifications