Fixed a bunch of stuff.  I apologise for the lack of clarity in this commit message, but my brain is about to dribble out of my ears.  Also, now evaluating XOR expressions correctly.  Also, more strings for evaluation, currently divided up in files in a way that makes sense to my addled brain.