more tests pass! crazy type matching
Transactionally update entities
Merge remote-tracking branch 'origin/extra-select'