Q&A added plus small changes