fixed dave's mistakes...again