Cleaned up principal stuff a bit

We now get a TheBenchPrincipal to have easy access to some properties.