adding changes to clean up loose ends