fixed some mistake that happend while replacing stuff