Cleaned up some error messages; fixed several memory leaks; revamp water cluster generator script