cleaning codes and bugs
bug fixed