merge w/ last upstream, cleantable use TRUNCATE, utility additions