changed several classes to public; commented out some unnecessary deserialization code (I hate dead code, so I will remove it when I am sure it is no longer necessary; added some more getters/setters