Changed collect to use _id for updates. Other minor tweaks.