deleted
fix associations, tests
fix bugs