Edits to Data, Test Files

Added a number of extra methods to the data classes, made a bunch of
junit tests, added documentation here and there, touched up some
widnows.