Further changes

Worked a little on foreign policy/ wars but what we really need is to
fix the return for certain methods.