Peacekeepers implemented, minor fixes