question adjustments and fixes