First Data Run

Fixed some infinite loop bugs