make a bunch of things use randSelect and general cleanup