minor fixes, rearrange .rfile items