Fixes, death refactor.