BugFix #50

Reordered the logic a bit: now it's a little less redundant on weekends, and it doesn't check for multiple blocks on weekends.