made some minor adjustments