Solve some long-standing glitches and significantly improve readability