refactor operations
fixed tests
bug with datamap fixed
colls -> subs, minor bugfixes