fix mistakes and replace old versions