Stage2 update

Less junk in code
Time delta for stage2