Rearranging, fixes