Update some getters and setters, reorganize