Browsersync/watch and some fine-tuning