Fixed #82; made additional bounds checks

This issue only specified map keys, but the same problem would happen if
out-of-bounds Weekdays or TimeBlock values were passed. Fixed both.