making progress

cleaned up some stuff and working on look ahead.