Started cleaing up the code, adding comments where the need them,
removing comments that comment out test code, etc.  Mainly just in
DataWatermarking.java though