Second set of code updates.

Also add numbers to each one for easy tracking.