Assign more diagnostic codes

This is great, thanks. Fixed.