just fixing everything