Updating fonts, cleaning up some
Post cleanup