cleanup the sql/updates a bit...