A few more minor visual/editing changes