small changes, about to move locations from users to ucellars