minor tweaks and cleanings