Grammar fixes, mako again