bugfixes
computed properties work on collections

mappings need some more work