Fixing time integration

Need to go over everything and make sure everything is affected by time