minor fix to make aggWindow equal for both timeline and raingraph

Also, some neatfication