Added some getters/setters, etc.