maybe fixed some stuff