adding removing some modules, tweaking config