remove svn tag and clean up some
bring in some upstream code
don't reuse builtin zip
do less simplifying, marine zones disappeared at 0.001