CARIBWHALE only - Improvements fixing many issues