fixed naming
added faction support
further cleanup