some changes and few fixes