- clean out some unused functions
- fix ex
- fix tests
- fix a few minor logic issues

tests are all working again!