Finished getters-setters, made getters-setters-2
Deleted comments