closes #96, closes #103, fixes fluidbox