More config goodies and add to run.sh