More Class Updates

Updating the lengthy class parameter code.

Tested and works on my machine.