fixes manifest and syntax refactor