fixed shitty stuff