Updated font handling
misc clean up
consolidated task types and names.