Beautiful, Firebrand!

Nice fixes and changes! Thank you for putting in the time and effort to get this all updated!