Add a bunch of stuff from MadTree's feedback