Vacations support, refactoring, comments