More updates

Todo: update comments.  I'm lazy and the comments still read v1.0.
More like v1.5.