Type stability

Refactoring of bench and also show actual works properly.

(I may have another commit for this which actually passes the tests, but making PR as a reminder)