updated comments and reorged some getters/setters.