eager loading more things

see latest comments on issue #655