tweaks and todos