user selection, bug fixes