maybe fixed some things... I can't be sure