zw - making a series of fixes