bug fixing on equality,few other changes