fix some bugs and add water