handful of small fixes
removed 8 day test and some print statements
merged conflicts