Some changes (to much things to list)