minor updates, moved things around
merged