Lots!

I forgot to commit at all last night. So this one has lots of things.

Property testing, added comments, and cleaned up a few things.

This might be the final one.