updated getters and setters to actually work