Some fixes. Drawing as delegate