Small fixes
Changes to evaluation
Code cleanup
association copyright