All checks and calcs as for Epoch 0 were added for Epoch 1 as well. Further cleaning of local variables to prevent cross-talk between Epochs.