More progress..
Fix up wind a little bit more.