Updated text + made some stuff public for tests to access.