big cleanup, added arrows for polylines