Bugfixes, Code Optimisation. (1.7-D11)

Fixes MASH-64 , MASH-62 and MASH 61.