Adding Thoma's corrections.
Added a thanks to Brent