Added MARA and other Fixes...
ok