tweaks to autopopulate