finished shitty fixes