Shifted some variables about to allow a better override from local.sh