Draw improvements

Including validating number of changes