Recent changes and some smarter things.
Fix typo in param checking and correct usage line.