synching up new mathAMA commits