Reverted changes made during cleanup and re-exposed some variables that should have stayed public. Opps!