updated files, logging, cosmetics