bugs fixed;adapted on working enviroment