fixed some further weekend issues