tweaking here and there
Fixes here and there. Working with whole collection