Cleaned up Tama somewhat and separated the text-UI (Tamatest) from the rest of the program
Various minor fixes