re-refix #2, #3: overflows are hard
dox
small cleanup