Added functionality to clancreation class and generally tidied up a bit