Fixing issue#1,3,4,8