update Makefile, added LOG_DISALBE as tunable parameter, some updates in source files, added logging