Fix up some bugs
apparently zip behaves weirdly