Oh goodness, I count that as doing well! Whenever I start getting huge nighttime cravings, I go to bed. At least it's keeping me from eating for no reason.
As for the water, I carry around either a 24oz or 32oz bottle filled with water, and I just sip it whenever I have an idle moment. It's tough, but you get used to drinking a lot of water after a while.