some changes from ICRA..
few more minor things
some more fixes from ICRA..
some more fixes from ICRA..