integrating MK's nw-init changes, removed zip support