Some minor changes in doc and function definations