Improved manifest and docs