User CRUD and small fixes