tidy up some names
fixed crash

will no longer crash if used on a day you have off