add font and fixed cleanup bug