Improvements to swzenc