Added rule-based baseline, small tweaks to oracle parser