added oil parser, fixed some emit problems