diff --git a/src/debug.h b/src/debug.h
index 2878c37..a2c36c9 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -15,7 +15,7 @@
 	}
 
 #else
-    extern std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>, wchar_t> converter;
+    extern std::wstring_convert<std::codecvt_utf8<wchar_t>, wchar_t> converter;
 	extern errno_t lfResult;
 	extern FILE* fileLog;
 	extern bool writable;
@@ -24,11 +24,14 @@
 
 #define initialize_file_log() initializeFileLogging()
 
-template<size_t Y, typename T> 
-std::bitset<Y> varToBitset(T info) {
-        std::bitset<Y> content(info);  
+template<typename T> 
+std::bitset<sizeof(T) * 8> varToBitset(T info) {
+        std::bitset<sizeof(T) * 8> content(info);  
         return content;  
-} 
+}
+
+#define print_as_binary(info)  varToBitset<decltype(info)>(info)
+
 #ifndef _WIN32
 #define log_debugcpp(str) do {											\
 	 std::cout << "[DEBUG]" << "(" << __FILE__ << ":" << __LINE__ << "): " << str << std::endl; \
@@ -55,24 +58,18 @@ std::bitset<Y> varToBitset(T info) {
 
 #endif
 
-
-#define log_to_file_simple(fmt) log_to_file(fmt, "")
-#define log_to_file(fmt, cnt...)  do {					\
-	if(writable)  fprintf_s(fileLog, fmt, cnt); 	\
+#define log_to_file(fmt, cnt...)  do {				\
+	if(writable) fprintf_s(fileLog, fmt,##cnt); 	\
 } while (0)
 
-
-#define print_as_binary(len, type, info)  varToBitset<len, type>(info)
-
 #define close_file_log_buffer() do { \
-		fclose(fileLog);			 \
+	if(writable) { fflush(fileLog); fclose(fileLog); }	\
 } while (0)
 
 #else 
 #define log_debugcpp(str)
 #define log_wdebugcpp(str)
 #define print_as_binary(len, type, info)
-#define log_to_file_simple(fmt)
 #define log_to_file(fmt, cnt...)
 #define initialize_file_log() false
 #define close_file_log_buffer() 
diff --git a/src/qt/qtclasses.cpp b/src/qt/qtclasses.cpp
index b7a90ba..b3595f7 100644
--- a/src/qt/qtclasses.cpp
+++ b/src/qt/qtclasses.cpp
@@ -83,7 +83,7 @@ void MainWindow::compose() {
 	/*
 	 * Setting correct widget widths and heights 
 	 */
-	log_to_file_simple("[Compose]\n");
+	log_to_file("[Compose]\n");
 	screen = this->getCurrentScreen();
 	log_debugcpp("Screen: " + screen->model().toStdString() + " " +  screen->name().toStdString());
 	
@@ -106,10 +106,9 @@ void MainWindow::compose() {
 		if (!epw) continue;
 		epw->calculateSize(windowWidth, screenHeight);
 		log_debugcpp("epw loop");
-		log_debugcpp("epw roles: " + std::to_string(epw->getEndpointHandler()->getRoles()));
+		log_debugcpp("epw roles: " + print_as_binary((epw->getEndpointHandler()->getRoles())).to_string());
 		//std::bitset<sizeof(uint8_t)> content =
-		//print_as_binary(8, uint8_t, (epw->getEndpointHandler()->getRoles()));
-		//log_debugcpp(content);
+		//content);
 		//varToBitset<sizeof(uint8_t), uint8_t>(epw->getEndpointHandler()->getRoles());
 	}
 
@@ -726,7 +725,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
 	QEvent::registerEventType(CustomQEvent::SessionWidgetObsolete);
 	QEvent::registerEventType(CustomQEvent::SessionWidgetCreated);
 	QEvent::registerEventType(CustomQEvent::RecomposeMainWindow);
-;
+
 	/* This spacer provides proper spacing when window vertically > widgets. */
 	lastRowSpacer = new QSpacerItem(1, 1, QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
 	ewsUpdateTimer = new QTimer(this);