fix behavior when skipping training or not starting at first trial; remove cruft; minor refactor
fix behavior when skipping training or not starting at first trial; remove cruft; minor refactor

drammock/gend-intel,drammock/gend-intel