added some new collectables, did some switch thing