few updates to improve user's experience