Tweaked some data fetching stuff to make everything smoother and more intuitive