More big changes

Mostly aesthetic