* add water block and other fixes