Fix a bunch of stuff from real world testing