continued linux/windows modifications