FIx some misnamed properties.

Thanks for the class! But it looks like your master version might not be a final? I needed to make a couple of tweaks to get it to run, but now it works like a charm.

Take a look and see what you think.

I'll follow this PR up with another that has no functional changes, but some white space clean up, etc.