Fix mesh

fix #45 and some more