small fix
association wrapper, sort, bug fixes
cleanup