improved drawing modules