cleaned up; minor tweaks