Fixes, death refactor.

the default probably makes sense here too.