added getters and setters where possible.