Finish up some minor modifications still

Final clean up and bugs for redis collections. I haven't been the best at getting this branch stable before merging it into master :/