minor scanner changes
parser stub added