minor tweaks and todos