Fix for going backwards in time
Cleaned up leftover transitional paste error, misc fixes