Add user works + Fixes and cleanup