fixing everything up