fixing everything =D