Fixed some cases for vacations, reformatting