Touched up code bits and added collection logic