Initial round of bug fixing.

A lot of annoyance occurring because MATLAB doesn't allow struct
fieldnames to have dashes.
--BRJ