ran parser spec; adjustments; bugfixes