Correct construction

Ravi, who was diagnosed with bipolar disorder in 2006 and suffered multiple meltdowns, returned to law practice in 2019 after he was ordered 18 months of treatment for offenses including assaulting an ex-colleague.

1. Should it be "he was ordered to undergo 18 months of treatment..."?
2. Should there be a comma after "offenses"?

Thanks!