made a few changes and updates