more changes to log output, cleaner