Added more font functionality and cleaned up some code