Added Fonts, Fixed API issue