Improve scripts
Improve README.md
Cleanup