add more macros, and hopefully fix ugly fonts