update manifest
manifest and build cleanups