Finalised some faction code
 prepared for claiming