remove some debug cruft
remove duplicate closing tags
keep user picks being edited in view
remove duplicate my
remove debug and stale comments
Note changes, set next version