made a couple minor modifications