made a few changes.