trying to fix some

FUCKING BUGS