Fixes and initial Hunter MM