Bug fixes and windows project update