cleanup and possible font fix