fixed a small mistake in Windows; some lint cleanups.