fixes, code cleaning 

script1 added , code cleaning in main file