More stuff and rearangements