General cleanup, added start of font-rendering