Cleanup and make options optional again

... to easy working with a config file
NF: Command to make a per subject template image