rearranging
more cell var cruft
remove support for ROT_*