Misc. cleanup and another try for PUT-able Nexson