1. SMBG events should represent actual SMBG events.  Pulling them off of a pump as the result of a Bolus Wizard is actually something that I hope we can stop doing at some point.  We can show the SMBG entered for the bolus wizard, but claiming that it is an SMBG is the actual problem you are pointing to, I believe.
2. Hopefully we have a method for the user to go back and modify said datum to be 230.