fix some issues; make light speed iterations quit in non-a*
Merge branch 'lightspeed'