another update

Move around a few things, clarified some details, made minor changes
Latest version