fixed stuff yayayayayaya