fixed windows warnings
clean up