fixed everything else