mako updates and major cleaning