added some minor changeges