various minor modifications