add input options for mate and vanilla ...

instead of having to specify variables inline