add user setting and some other updates