stan improvements part 2