Some question answer checking added.