Some more cleanup; visual upgrades