refactoring and manifest fiddling