No need for sets when collections work just fine

also fixed a couple of privates that should of been public