fixed r.row() and other odd behavior