Further changes, bug fixes and tweaks to collections