Tidied up some LONGstanding js TODOs, changed days in office logic