Added a new parameter for weekly checks, fixed some bugs