Added winston, various small fixes
removed .bak files