remove weird texts
merge Pie & J changes