Lots of changes to war, spelling fixes, and read me