Some package cleanup. README cleanup.