Fix a bunch of stuff based on feedback