made updates and fixes