manage working for users and other small fixes