Minor changes + more native functions