Added supervisor config, tweaked some default variables