refactor a bit
updated NLog
some cleanup