Comma in the echo string breaks the function

Will look into later.
Updated todo