setup-development-environment.sh bug fixes and enhancements