Added some nicer collection stuff and fixed a couple things