Mako guns polish

Pushed to switch branches