- Fixed and added doc strings.
- Changed a couple param names, with Doc's approval.