Set Getters to be const and general fixed up and added some extra setters