Small changes and couple of comments