fixed day 1 bugs