doc and minor fixs