updated collections and tweaks