removed draw_arrow function & minor changes