remove the manifest and fix some bugs