minor bug fixes; all smoke pass (includes all from tt-many)
snap