more cleaning up and font changes