Some more Modifications

Some more Modifications for User Friendly usage.