added some minor changes and suggestions