switch to brunch with fixed small issues