No GraphFace no more!
Minor fixes and refactoring