added wir, minor updates