fixed up the skeleton a bit more, filled in some getters/setters