All kinds of changes and fixes