Several fixes and updates

several pages were redone and corrected