small changes
merge windows bug