fix waterBar bug and some others