Logging off; more trees; renamed to reflect new API