commandwin added and other fixes