Some changes xcode wanted me to make