More fixes and code improvments.
Also print m/c/+