Added location and unit options to @wa, new config options!