Bug fixing and updated legends