improved drawing and added export