not-stat + minor changes