- Added toString for debugging.
- More consistent member ordering.