some cleanup, font changes