fixed everything (hopefully)