116 more improvements and fix