Latest changes to zsLib