Improved meshing

Still bad though...