editQuestion and minor changes