language changes: fixed duplicate exports, removed warnings.