Fixed up some of the cmdlet names and parameter name, and bugs.