Fixed Goblet issues

Closes #201, #204 and #205