fixed fucking everything mmaybe