Made a couple of variables public - hopefully should be able to return them to protected in the future.