Some changes

Some changes I have made over the last month without being able to sync