New syntax for latest Winston

There's some new syntax and bugfixes in here.