a lot of cleanup, updates to debug mixins