fixed everything here