made some minor changes, ran tests