Small rearranging and stuff.