fix some rntn bugs, a few more to go