So many places to fix this, thanks for catching all of them!