Updated makemake
- yet more unfinished changes