Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.
Forgot changelog :x