A bit more power distribution work and renaming of nets -- making things a bit more explicit.