cleanups and improve time shifting logic
more improvements and adjust timeline
adjust to work for this year
rollup of changes made for NWA workshop 2013