Added font stuff to header and fixed some types