more tweaks and polishes to logic and look