Add <sup> and fix some other regex bugs.