CF-1 User editing
* Several small fixes
* User editing functions bootstrapped