v2.0.4 updates

Arguments with newlines now specified as <arg></arg> keys.