Added new feature, correct argument name
Re-corrected things. Added two new features.