Pulling the dates correctly form the form. Minor fixes