Update several aspects of mara_tools