Minor bugfixes and cosmetic changes inside droplets.