stabilizing the project, adding missing implementations