#2 #3 font improvements