small fixes for questons