added fonts, added changes from last pull request