Improvements for boot.sh