Changes to vacation calcs
fixes #100
fixes #101