cleaned up logging, dynamic adding files