half done faculties; refactoring; fixes