minor changes
Adapted draw function for better visualisation. TODO:target needs rims