some fixes 4 week