added and refactored questions