Collapse 10

- Collapsed two types for #10
- Accidentally fixed some bugs I found on my other computer
- Some name re-factoring as well