Lots of fixes.

I also played around with fluids, and added something thats for BR. Its
not permanent here.