Update bourbon and minor changes