added stuff, cant remember
fixedmerge issues