fixed problems that appeared during the testing