Fixed minor issues
Fixed weekend issues