kill magic numbers, add better comments, and TODO for later PR