changed few
important fixes
important fixes 2