Pre-staging module touchups

The usual weekly touch ups.