Cleanup/alignment
Send error message on bad user update
Cleanup and better user feedback