extended start script clean up and fixes for install/upgrade

Thanks. Damn OSX :). I'll switch it to `-f`