minor tweaks & todo's