Fixes

i have does the fixes for you only merge the pull request 
its contains all acitve issues