updated mman, other changes