Water density + some improvements