updated deps, cosmetics
Merge remote-tracking branch 'origin'

updated deps, adjusted cosmetics