Personal tweaks, no code changes yet.