fixed small bugs added draw support