Fix #23;Refactored and updated all of draw.complex