Rework
Cleanup
More update
Update bootstrap.sh pair