Fixed a bug where coming back to retrieve a missed collectable wasn't counted if all the others were not pickup as well. Also fixed a few other minor bugs.
