Some rearranging here and there.