Added some finetuning of fluidbox implementation...