All problems with collecting should be solved now. 

Thanks to Thefaucetrunner for helping test it.