Add join signs, general code cleanup