moved questions to end, other small changes