cleanup
fluid updates
build