fixes to ma
fixes and rename