Updated doc and other minor fixes