big refactor: adding the non-buggy things to the factorie package object