Parameter changes, use Flip timestamps, some cleanup