Clean up of draw and being

Added more loop wrapping