pre-Thanksgiving status, refinement and syntax cleanup