Final cleanup

I'm a bit glazed after fighting with tables all morning so can someone give this a quick look to make sure I didn't mess anything up.