Clean Things up.

-clean things up
-font support