Fixes for #401

Needs to be quickly checked over before we merge - mainly for spelling.