Fixed a bunch of setters and getters