First synch from Win7

Fixed a few things