- Sorted out some types.