Quick fixes and various improvements