madlib.cpp changes and madlib.h changes