Small changes, but mostly changed lists to either maps or sets

I was using arraylists in places that did not need to be lists so they are either hashsets or hashmaps now. I kept a few the same though.