final changes, removed fonts as they crashed it occasionally