updating with latest fixes