tweaks to condition checking and startdata checking