New better Multi-z map! and other chnages