Fixed Calamari and Mutton issues

Closes #284
Closes #285