More changes...

General changes