added last seven days to pulse; fixed bug with counting overall