took out a few things that were causing issues