misc chages & improvements

Several changes and improvements added as per need