new entry: war, and other fixes