Fixes, death refactor.

as above