fixed a week issues