A couple more modifications, as well as some comments to ease others'