Updated rearrange/ added a couple small things