A lot of changes

I forgot to sync, there are too many changes to list.