Fix rounding
cleanup and add others legends for percentage remainder