Add cylindrical source terms, improve the Mathematica code