BF: draw_sig up to two cols & other small fixes