fixed font, added conditions