mod manifest to bring in line with master branch, issues merging