tachyon related
tweak
Minor fixups.