Adding a few more getter and setters and fixed some spacing and formatting