Changes and fixes and things