cleanup.
making r16 compatible.
merge.