fix getters/setters for associations
cleanup