fixes tons more shnit