more analysis tweaks