Isometadatafix

merge fixes and get rid of branch