Bugfixes. Added in-place upgrades. Readded Fluid support.