Fixing hole invocations.
Fixed the manifest issue.
Minor fixes.
More cleanup.