more PUT changes, and tests