minor tweaks. sweeping up