Update remaining screening variables to have units

This fixes #4