draw improvements