rearranged some stuff and removed temp code that forced location of error toast