new powerful logging, cleanups