weekends bugs fixed