minor changes to visir parser