- Clarifying some comments
- Changing some throws to ASSERTs