model: fix property instantiation
adapter: use a type instead of an instance var for each
adapter/storage: some additions and fixes
collection: don't try to instantiate if it's already a model