Fix loops
Some changes to date