Fix a lot of stupidity and things