question changes, bug fixes