Fixed my infinite loop bug and rearranged some character gen stuff to
fix an occasional null pointer problem