Fixed up most of the get and set methods.  Made things look neater...
ahh Andy, didn't look at documentation??? lolz