More bug fixes.
this gets 10 Robert Downey Jr's out of 10 Robert Downey Jr's
Did you just go full Robert Downey Jr?