fix location and condense week creation