Option to enter user_id, and other minor changes