All CR changes, more docs.
Missing import added