More import work
parser and file-class fixes