Fixed questions etc

Fixed questions etc
changes

changes