bunch of fixes

fixed operations with collections