Updates

A few tweaks to reduce notices, comments inline for clarity and detail.